Merge branch 'master' of http://git.denx.de/u-boot-mmc
authorTom Rini <[email protected]>
Thu, 17 Nov 2016 16:46:56 +0000 (11:46 -0500)
committerTom Rini <[email protected]>
Thu, 17 Nov 2016 16:46:56 +0000 (11:46 -0500)

Trivial merge